Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Sun, 28 Jan 2018 02:55:04 +0000 (21:55 -0500)
committerTom Rini <[email protected]>
Sun, 28 Jan 2018 02:55:04 +0000 (21:55 -0500)

Trivial merge